e54aa8e6077a96510ad58d2acc3150e2e9ea76ad,opennms-services/src/main/java/org/opennms/netmgt/collectd/Collectd.java,Collectd,handleReinitializePrimarySnmpInterface,#Event#,1190

Before Change


        int nodeid = (int) event.getNodeid();
        String ipAddress = event.getInterface();

        reinitializeCollectable(nodeid, ipAddress);
    }
    
    private void handleNodeScanCompleted(Event event) throws InsufficientInformationException {

After Change


        // updates map and mark any which have the same interface
        // address for reinitialization
        //
        Category log = log();
        
        OnmsIpInterface iface = null;
        synchronized (getCollectableServices()) {
            Iterator<CollectableService> iter = getCollectableServices().iterator();
            while (iter.hasNext()) {
                CollectableService cSvc = iter.next();
        
                InetAddress addr = (InetAddress) cSvc.getAddress();
                if (log.isDebugEnabled())
                    log.debug("Comparing CollectableService ip address = "
                            + addr.getHostAddress()
                            + " and event ip interface = "
                            + ipAddress);
                if (addr.getHostAddress().equals(ipAddress)) {
                    synchronized (cSvc) {
                    	if (iface == null) {
                            iface = getIpInterface(nodeid, ipAddress);
                    	}
                        // Got a match! Retrieve the CollectorUpdates object
                        // associated
                        // with this CollectableService.
                        CollectorUpdates updates = cSvc.getCollectorUpdates();
        
                        // Now set the reinitialization flag
                        updates.markForReinitialization(iface);
                        if (log.isDebugEnabled())
                            log.debug("reinitializePrimarySnmpInterfaceHandler: marking "
                                    + ipAddress
                                    + " for reinitialization for service SNMP.");
                    }
                }
            }